not fine team
conflit resolved