Commit do war
Merge origin/master