Git Merge Atlassian