Small changes and fixed conflict