merged conflicts
added notes