I did something stupid while merging?