merges refactor