Conflict test

Merged some conflicts