fixed merge conflict markers
Merge branch 'feature'