Prepare merge with upstream
Commit before merge
Manual merg eafter update