Merge and fix build