examples of error and merge conflict