Edited merge conflicts, added glow.cpp