Resolve the merge conflict
Resolved the conflict on pull latest merge