correcting git errors. starting from previous commit