fixed conflicts of the merge