Properly fix merge