feature_2 commit 1
featrue_1 commit 2
feature_2 to develop merge confilicts resolve