Added Stash - Merge conflict solution