Wrong word fix.
Deal with conflicts.