removed remains of some merge conflict
Merge pull request #779 from panmari/merge_fix

Removed remains of some merge conflict