remove weird merge artifacts