I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan
How to fix this