Git Merge From Terminal 5