Repaired conflicts in pButtonView*.html