Psst, you have a merge conflict in your text