added tag support
resolved conflicts