task1&2 commit