fix incorrectly merged file