fix bugs when select new team and member
resolve conflict