Mamelodi man convicted for assaulting his neighbour