Sneaky Merge conflicts