Still trying to fix git
Fixed merge conflicts