worked on vechile management
conflicts removed