new trhangsss
link
Fixed conflicts...maybe
Fixed Merge Conflicts