Fixed problem with merge / conflict resolution.