Ship a Feature: Branch, PR, Conflict, Release

Complete "Team Workflow and Good Commit Messages" to unlock this project.