fix jira and write specs
fix conflicts