its done
sam added to folder
chir is created
merge conflit