Resolves css conflicts