Anti merge-conflict commit