Report question

Question: git reports merge conflict with no changes, empty lines (using git-subtree)