added val
added val to new file
added val to new file
removed conflict data and renamed file