This pull request can't be merged automatically, it means that there other changes that already pushed that conflict with this.

• can you get fetch from master and rebase ?

LGTM.
I think you need to sync up and resolve the conflict before someone can merge it.

The conflict might be caused by pull request #272

fixed by pulling and resolving

Thank you for your pull request. Before we can look at your contribution, we need to ensure all contributors are covered by a Contributor License Agreement.

After the following items are addressed, please respond with a new comment here, and the automated system will re-verify.

• One or more commits are not associated with a GitHub user. The email used in the Git commit must match a verified email address in a GitHub user profile. For more information, please see https://help.github.com/articles/why-are-my-commits-linked-to-the-wrong-user/

Regards,
CLA GitHub bot