Fix merge artifacts.