finally commiting staging changes...
merge conflict removed...