Troubleshooting HEAD conflicts