fixing changed made by git