Testing the Git merge thingy