fixed incorrectly merged file