listing feature spec
fixing merge conflicts