adding JIRA Source Connector
resolving conflict