adjust bundler path setup
stop merge commits