slight changes to run the coffee server
fixing merge conflict