- Working on conflicts resolution