us5976 - deletes
us5976 - fix merge conflict