Had problem merging branch

Deleted branc and copied and pasted... lost history, but oh well