formatted lunch_server code s.t. merges aren't too annoying