fixed  merging with parameter
Merge pull request #1 from vaxo/master

fixed  merging with parameter