commiting.
fixing conflits