rework interface  add form type image
fix permission
fix merge