Fix styles after merge