css fixed after merge