Start manually merging changes from dev.