Merged some conflicts