Remove merge artifacts that snuck in