starting developing functions panel
resolved conflicts