You could wait a bit after forking.
Squash commit can fix the conflict.
Doesn't work if there are too many diffs
Diffs can always be patched up.