Merge local changes with github changes 2/2