Plot rudiments
resolved conflict