Corrected merge errors