Fix merge faults