fix cvs up conflict