merge origin/master and fixed conflicts