How To Resolve Merge Conflicts In Intellij