first cut
resolved conflict