ignore file
ignore file merge
sync with sciclone