removed basic fortune
resolved merges