random save
fixed merge conflict and code standard