stop rebasing and force pushing; merge instead