before pull
resolve site conflict
conflict resolution
Merge branch 'master' of https://github.com/awidarto/shopfair

/github.com/awidarto/shopfair
auction panel
merge hot
Merge branch 'master' of https://github.com/awidarto/shopfair
add tracker
pull hot
Merge branch 'master' of https://github.com/awidarto/shopfair