Fixed some merging weirdness