merge version before switch to git