add missings
resolve conflict