[Solved] Progressive Lightmapping and Collaborate

I switched my project over to Progressive Lightmaping from Enlighten and submitted the project to Collaborate. Now when someone pulls the commit they get an "error resolving conflict" for all of the Progressive lightmap files. What is the best way to handle Progressive Lightmaps and Collaborate?

 

Update: I selected see all in project and selected all of the files and chose theirs. I then reloaded the scene at it appears that the new lightmaps are being used.