Commit before merge with stas