bitshifting updates
bitshift+mod finding
conflicts resolved