merge conflicts and error messages changed