fixed bug when having multiple editors
fixed conflicts