resolve conflicts and renew the editor code