WebGL viewer showing up & updating live
merging conflicts