some conflicts were resolved

there are some conflicts were resolved