formular references removed and error in templating due to merge fixed