Merge all branches to master again