remove on_loaded call, merge error