fixed conflict and other errors