build after merge