Committing local changes from EC2 instance
Resolving merge conflicts on EC2 instance