starting work on conflicts