Fixed leftover conflict