commit to create branch web service
commit to pull
commit after merging branch
commit after fixing conflictions