Resolve Conflicts in a Pull Request in an AWS CodeCommit Repository