Fixed improperly merged file.