updating services
updated conflicts in nav