fixing merge
Commit new changes