master-merge errors;