When did East and West Florida Merge