remove more conflicts