the other new item was added
resolve conflict and merged some html elements