Manor merge glitches fixed.