Conflicting Files Updating

go here:

closed