sort merge conflicts