Screwed up a merge
3rd try's the charm?

Don't know how to operate this damn thing..