fix merge conflict and ignore user specific arduino port