merge conflicts
added price format
fix merge commits