Resolved conflict with libraries