Fixed merge faults