commiting change from gitbash
resolved conflict my way