added git ignore
fixed merge conflict