python service finished
fixing merge confilcts