Fixed Merged files