Project/module descriptor (.ipr, .iml) merging

What happened to it? I remember being able to manually resolve conflicts after updating those files. Luckily, it's been a long time since I last had to do this, but it happened today, and IDEA offered me only two options: keep the local version, or the remote version.