Merged it all and push it up