remove gid tag from version to avoid merge conflicts