Merge all current changes to upstream