Clean merge