fix verson conflict amony teammates