commit new feature in new branch
Resolving conflicts