Merging Plans with Quantitative Temporal Constraints, Temporally Extended Actions, and Conditional Branches