moved nose to neck
merged noseinneck with master, resolved conflict with 2noses