Just spent 7428 hours in resolving a merge conflict. @github please find a better way to resolve merge conflicts.
0
0
0
0
0