Remove merge artifacts