clean up and add ignore file
merge