merge errors corrected