fix: merging issues