hey
fixed some conflicts