adding files missed in merge due to incorect gitignore