some ugly movings
resolving some git error