Fixed file paths for merge