more unfucking the merge