Commit by Master
Commit by Staging
Resolve Conflict