Edits, added section on conflicts