preparing to merge
fixing merge changes
ASdf
added prices