merging issues - hopefully fixed