Report question

Question: git merge: Removing files I want to keep!