Manually merging branch.