merge2, remove code mirror