small failures at merging of branches fixed