fixing comflicts