Remove duplicate function
Fix a bad merge
Merge branch 'master' into robohealth