Fix merge files