Can't merge on my computer... git failing... grrr