re added the merge-lost git ignore items