merged some conflicts