Fixing leftover conflict