Fixed file conflict

Fixed the conflict with the two file versions