Added note 4
Fixed merge conflict