fixes in merge