fixes merging issues