before pull
modificated afted conflicts
special bi-form for edit_images