features1
resolved merge with features