fixing issues caused by incorrect merging