Added git checkout merge functionality