stash files for merge
fix merge conflict
update Kim's code