read me added
conflicts fixed