ROOMS-241: Fix duplicate hook_update_N after merging branches