More bad merge issues