Praise the lord, fixed git merge