Fixed merging snafus