Fix problem with tasks
Conflict resolution