Git is being weird...
Tried to merge