merge edited