merge and latest changes