updating backend
resolving conflcts