Git Merge Stack Overflow Java