Fixed merge artifacts