merge and resolve conflicts for pull request

i ve resolve conflict for pull request
in github i ve merge my source with origin
resolve conflict

resolve ardublock.properties conflicts