Second commit on git repo
Commit desde bash 2
Resolving conflicts from bash