Remove conflict marker left in error
Merge branch 'master' into jimweirich