made changes to iScissor.cpp
resolving merge conflicts