Git merge practice lesson