Fixing merge faults.