resolved conflict and updated environment