Fixed bug that caused crashing when merging files with histories