Remerge Master and Temp