Conflict fixed and 	modified "how does it work"