Update and rename .gitignore to merge.cpp