@SarahDi the problem is clear and the fix easy:
You can now pull develop again.
develop
(sorry for the delay, I only now managed to find some time to look at it)