Marginally simplified
fixed some conflicts