merge fix;
added git ignore changes
merge fix