Merge errors corrected