gemfile updated
conflict removed
added imei auth and block transfer