Corrected some merge errors