complete task 2.1
commit make in feature 3
complete task 2.2