Shoko, no disrespect but you should be able to fix at least this type of issue. You've been around for a while, no excuses mate. I'm only saying it because one day you'll encounter a problem that could be easily resolved but you wouldn't be able to do it because you don't learn the basics. It's just an advice.
Besides, this is not a bug, just a conflict when applying a patch. I think you should use the questions section next time :)
Copy the conflicting import from right window and place it in a free space in the left window, it should fix the problem. Don't forget to approve the merge.