first complete version, lack of simple database mechanism
resolve conflict