Fixed CSS merge conflict