Resolved conflicts in NodeModel.cs, NoteModel.cs and PortModel.cs