Fixed merge problems
Fixed merge problems