solving git problems

Same version 22/04/2013