Resolved conflicts from my stash