UK merges Foreign Office with overseas aid department