Tag adding works.
Fixed conflicts