tambah gitignore
merge file