Conflict resolution

resolving conflicts in order to merge pull request