commiting before pulling
resolving conflicts