can add picture
fix merge conflict