git workflow

Mearge conflict resolution: Edit the confilct file manually and then commit to branch