changes before pulling
merged