Mersbranch

I resolved those conflicts and added both of our awesome text!!