add newb
resolve conflict