css update after merge conflict