removed #barntalks2
merged conflict