Add function to handle JIRA task commits
Resolve conflict after pulling from remote.