Code

merge overwrites unstaged changes in renamed file