[Build] Use merge instead of rebase from master to master_integration