merging both branches