Master Commits
Conflict Resolution