Fixed style merge