Fixing broken merge stuff cuz git wouldn't let me push or pull