IE7 styles and merge conflict resolution