permalink added
merged conflicts