Fix custom css merge conflict.