Idea Git Merge Incoming Changes Into