Weird file state from previous merge