Bring everything to master