removed conflict that was comitted