Reverted again, trying to get resolve conflicts working.