Functional merge after rebase