Merge first version