unresolved conflict with main loop