Fixed git ignore for merge.