Removed .gitkeep files that were throwing an error with file merges