updated ignore file
REBOOT
merge fix