merged some