removed old version of project
clear both
changed everything
'resolved conflict'