adming img upload and edit
conflict repair