formatting
added conflict list screen
updated readme