Merge temp branch with master