added new pages
conflicts resolved on index and idea folder