Fix bad merge on DisplayManager.class.js

For some reason the rebase on this file didn't complete and merge markers were left in.