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

conflict-solved
Merge pull request #2 from oscmejia/vov

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