github-conflicts

Resolve merge conflicts safely