trying to clean conflicts