FEATURE: incorporated the sonar sensor and servo
fixed merge conflict