conflict-solved
Merge pull request #1 from oscmejia/new/merge-conflict-solved

conflict-solved