git jira improved
fixed merge conflic