How about them merge-conflicts?