Fixed git errors. All changes made committed