remove dupe code from merge and fix refactor bug in expression.get