Update task
resolve merge conflict
Remove extra files