corrected git merge issue
corrected git merge issue

chaveiro/emoncms,emoncms/emoncms,chaveiro/emoncms,inverse/emoncms,emoncms/emoncms,emoncms/emoncms,chaveiro/emoncms,chaveiro/emoncms,emoncms/emoncms,inverse/emoncms,inverse/emoncms,inverse/emoncms,emoncms/emoncms