fix prev merge