Git Merge Stack Overflow Error