commit before pulling
merged, and conflict resolved
localised