Cleaning up an accidental merge