corrected merge errors