Assembly Setup OK
Conflict
Conflict 2
gg
Back to old files
conflict
Fix Files
conflict again
Conflict files