20131209 user-update info
20131209 woyingConflict