clean vps
resolve conflit