uncommenting code that creates visual references lost during merge