flattened commit after multi-ssh disaster
nptech image
fixed conflicts