merging parallel branches made on accident