Undo a merge conflict resolution done wrong

The ilib files should not have been changed.