parent of all merges

merge all the branches