Seperate merge and rebase helpers
Move exports to top level
Update comments