Commit desde local
Merged into master