Changed price
resolved conflict