Stash changed files to pull from master
fix merge