Added user notes
Fixed merge conflicts