forcing links to open in a new window
merged conflicted files