Manual alignment version code between branches

My fault