css fixed (merge error)