resolve conflict alias, and add jshint rc.