adding git ignore
fixing merge conflict