merging branches with thomas nowak