Improve output when there are merge conflicts