debug version, save temporarily
resolve conflict