Commit of the final files
Resolve commit conflicts