updated

newly updated files
conflict resolution

duh