Cleanup merge artifacts and typos