Fixed incorrectly merged file