add detach file, are we back to the past?
Merge branch 'rollback-after-merge'

merge after detach HEAD back to past