updating distance feature
resolving merge conflicts