Testing merge functionality of Git