Not a problem; whichever branch gets merged second can rebase and resolve the conflict.