merging to master
fixed merges