Merge with remote
Merge with upstream
Merge with Quan