commit from maven branch
conflicting commit from jira branch