git problems fixed and merged