Having to merge everything by hand due to a glichy git program