merge the current initial version