added beercost
fixed merge conflict