Fixed merge conflict for choosing port