Readded files to be tracked
Attempted merge fix