Removed unused git code
Removed unused dependencies, added better handling of unmerge-able file types