How To Resolve Merge Conflict In Intellij