Fixed merge conflcts