Support for merge conflicts