New tasks
Fixed conflict