Merge NC and App version