Remove git stuff after botched merge