Server comunications OK
Merged files