merge files najara-and-rafael