no major changes
resolved conflict