Added git ignore
Fixed merge issues