Commiting changes before merge with upstream