committing before pulling
merged remote and local