Following deadly border clash, aid convoy enters Gaza