some tasks
resolve merge conflict