finished desciptions
merge error fixed