Fixed merged file paths