Installation instructions, readme updates.
Conflict resolution.