build update and merge fix