Removed merge artifacts.