Remove .merge and .concat and use .clone instead - also remove 'if' conditionals that weren't required