Resolved conflict with CVSIFT