feature specs marked as pending
resolved merge confilcts