Files from staging
Resolve merge conflict
Resolve merge conflict