Merging initial version