Added in the p styles
Solving merge problem