added p18
fixing merge
added answers for p18