fixed conflicts in merge to master