fixed leftover conflict