Remove comment and fix stylesheet merge conflicts