fix #152
fix #152
fix conflict in task