add picture for user
fix bug test
fix merge