Actually fix merge properly this time