prestash
fixed merge conflicts
removed extra files
merge