Fix for infinitLoop glitch
conflict fixes