merge? I tried to push my recent updates, hoping I haven't messed up things. All intermediate versions are kept anyway, right?