forgot about git pull after laptop upgrade
resolve conflicts