I suck at merging, had to fix layout