Fixing build after merge