removed conflict git names with utool