fixed conflicts after merge