Fixed merge artifacts.