updated conflicted file
updated master file
merged file