Fix to "Resolved Conflict" & Suggested layout

I also hope that no one added the HEAD <<<<<< thing... it looked like
something github threw in when I was resolving conflicts. Also added a
suggested Fix to our current layout