make things work properly when working with git