update from github
merged
fixed main conflicts