Fixed Files After Merge