git branches confusion, merging ..