added notes for next dev cycle
resolving merge conflict