git: merging & test