unfucking the merge reverts