merge with last build