From A, without pulling first.
Fixed conflicts.