conflict resolve in middle of working on team gui