added some info in the about
resolved confilt