orig files should not be tracked
do not track merge files