fix

deleted merged file