fixed merge conflcts