Fix css auto merge
Refactor code