Load file & maintaining file state for each workspace
Merged conflicts