I hate CM merges