Change git base for merge as well