Give a go at fixing it. I suspect it will resolve out because of the nature of of git. My merge into the other branch shouldn't affect further development here.