reset project
clear
Merge branch 'develop'
clear