Merge nico patch