updated Cowboy-related code
conflicts resolved