Merge pull request #386 fix conflict