css merge bug fix #657