Merge local changes with github changes 1/2