git problems
Fixed merge errors