Re-adding things lost in a merge