Finish error fixing with git control mistakes