Added a troubleshooting section.

Added a troubleshooting section with some instructions for what to do if changes cannot be automatically merged in a pull request.