corrects formatting messed up by merge