finished conflict resolution
finished general git section