HSConflictResolver使ってみたけどなかなか便利だな