Testing of my merge errors